From b29f4c1e37c78874048a34700a967973bb31fbf9 Mon Sep 17 00:00:00 2001 From: Juergen Gross Date: Thu, 28 Jul 2016 09:21:43 +0200 Subject: [PATCH] libxl: fix double free when doing xl save Commit d2412fd63b14c6c21d0a3d4367afa448425dfb8a ("libxl: move common nic stuff into one source") introduced a double free error in libxl which occurred during "xl save". Correct this error. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_nic.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 278285a532..760ebcac7e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3228,7 +3228,7 @@ static int libxl__device_channel_from_xenstore(libxl__gc *gc, GCSPRINTF("%s/name", libxl_path), (const char **)(&channel->name)); if (rc) goto out; - rc = libxl__xs_read_checked(NOGC, XBT_NULL, + rc = libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/connection", libxl_path), &tmp); if (rc) goto out; if (!strcmp(tmp, "pty")) { diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c index ff1834fbe3..c34b7bae8b 100644 --- a/tools/libxl/libxl_nic.c +++ b/tools/libxl/libxl_nic.c @@ -321,19 +321,19 @@ static int libxl__device_nic_from_xenstore(libxl__gc *gc, memset(nic->mac, 0, sizeof(nic->mac)); } - rc = libxl__xs_read_checked(gc, XBT_NULL, + rc = libxl__xs_read_checked(NOGC, XBT_NULL, GCSPRINTF("%s/ip", libxl_path), (const char **)(&nic->ip)); if (rc) goto out; - rc = libxl__xs_read_checked(gc, XBT_NULL, + rc = libxl__xs_read_checked(NOGC, XBT_NULL, GCSPRINTF("%s/bridge", libxl_path), (const char **)(&nic->bridge)); if (rc) goto out; - rc = libxl__xs_read_checked(gc, XBT_NULL, + rc = libxl__xs_read_checked(NOGC, XBT_NULL, GCSPRINTF("%s/script", libxl_path), (const char **)(&nic->script)); if (rc) goto out; - rc = libxl__xs_read_checked(gc, XBT_NULL, + rc = libxl__xs_read_checked(NOGC, XBT_NULL, GCSPRINTF("%s/forwarddev", libxl_path), (const char **)(&nic->coloft_forwarddev)); if (rc) goto out; -- 2.30.2